Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 18 Mar 2010 07:22:27 +0000 (08:22 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 18 Mar 2010 07:22:27 +0000 (08:22 +0100)

Trivial merge